server-node: Updated backward compability and packages

os-js · Nov 19, 2016 · 346b194 · 346b194
1 parent 4f4daf6
commit 346b194
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 41 deletions.
diff --git a/src/packages/default/Broadway/api.js b/src/packages/default/Broadway/api.js
@@ -1,9 +1,12 @@
 (function() {
 
-  exports.register = function(API, VFS, instance) {
-    API.broadway = function(args, callback, request, response) {
-      callback(false, false);
-    };
+  module.exports.api = {
+    broadway: function(instance, http, resolve, reject, args) {
+      resolve(false);
+    }
+  };
+
+  module.exports.register = function(instance, metadata, servers) {
   };
 
 })();
diff --git a/src/packages/default/Settings/api.js b/src/packages/default/Settings/api.js
@@ -30,21 +30,13 @@
 (function() {
   'use strict';
 
-  /*
-   * See http://os.js.org/doc/tutorials/application-with-server-api.html
-   */
-
-  //
-  // Run `app._api('test', {}, fn)` in client to reach this
-  //
-  module.exports.test = function(args, callback, request, response) {
-    callback(false, 'test');
+  module.exports.api = {
+    test: function(instance, http, resolve, reject, args) {
+      resolve('test');
+    }
   };
 
-  //
-  // This is called whenever the HTTP server starts up
-  //
-  module.exports._onServerStart = function(server, instance, metadata) {
+  module.exports.register = function(instance, metadata, servers) {
   };
 
 })();

diff --git a/src/server/node/core/instance.js b/src/server/node/core/instance.js
@@ -262,21 +262,23 @@ function registerPackages(servers) {
     };
   }
 
-  function _registerApplication() {
-    if ( typeof module.register === 'function' ) {
-      module.register(instance, packages[path], {
-        http: servers.httpServer,
-        ws: servers.websocketServer,
-        proxy: servers.proxyServer
-      });
-
+  function _registerApplication(packages, module) {
+    if ( typeof module.api === 'object' ) {
+      if ( typeof module.register === 'function' ) {
+        module.register(instance, packages[path], {
+          http: servers.httpServer,
+          ws: servers.websocketServer,
+          proxy: servers.proxyServer
+        });
+      }
       return false;
     } else if ( typeof module._onServerStart === 'function' ) {
       // Backward compatible with old API
-      module._onServerStart(server.httpServer, _createOldInstance(instance), packages[path]);
+      module._onServerStart(servers.httpServer, _createOldInstance(instance), packages[path]);
+      return true;
     }
 
-    return true;
+    return typeof module.api === 'undefined';
   }
 
   function _registerExtension(module) {
@@ -303,7 +305,6 @@ function registerPackages(servers) {
         };
       });
     }
-
     return true;
   }
 
@@ -339,17 +340,14 @@ function registerPackages(servers) {
         const check = _path.join(instance.DIRS.packages, path, filename);
         if ( metadata.enabled !== false && _fs.existsSync(check) ) {
           var deprecated = false;
+          var loaded;
           if ( metadata.type === 'extension' ) {
             logger().lognt('INFO', 'Loading:', logger().colored('Application', 'bold'), check.replace(instance.DIRS.root, ''));
             deprecated = _registerExtension(require(check));
             _launchSpawners(path, module, metadata);
           } else {
             logger().lognt('INFO', 'Loading:', logger().colored('Extension', 'bold'), check.replace(instance.DIRS.root, ''));
-            deprecated = _registerApplication(require(check));
-          }
-
-          if ( typeof module.api === 'undefined' ) {
-            deprecated = true;
+            deprecated = _registerApplication(packages, require(check));
           }
 
           if ( deprecated ) {

diff --git a/src/server/node/modules/api/application.js b/src/server/node/modules/api/application.js
@@ -76,9 +76,12 @@ module.exports.application = function(http, data) {
         }
       } else {
         // Backward compatible with old API
-        if ( typeof module[ameth] === 'function' ) {
+        var imported = {};
+        module.register(imported, {}, {});
+
+        if ( typeof imported[ameth] === 'function' ) {
           found = function backwardCompatibleApplicationApiCall() {
-            module[ameth](aargs, function(error, result) {
+            imported[ameth](aargs, function(error, result) {
               if ( error ) {
                 reject(error);
               } else {

diff --git a/src/templates/package/service/api.js b/src/templates/package/service/api.js
@@ -30,8 +30,19 @@
 (function() {
   'use strict';
 
-  // See http://os.js.org/doc/tutorials/application-with-server-api.html
-  module.exports = {
+  /**
+   * Registers your package when OS.js server starts.
+   */
+  module.exports.register = function(instance, metadata, servers) {
+  };
+
+  /**
+   * Registers your Application API methods
+   */
+  module.exports.api = {
+    test: function(instance, http, resolve, reject, args) {
+      resolve('This is a response from your application');
+    }
   };
 
 })();

diff --git a/src/templates/package/simple-application/api.js b/src/templates/package/simple-application/api.js
@@ -30,10 +30,6 @@
 (function() {
   'use strict';
 
-  /*
-   * See http://os.js.org/doc/tutorials/application-with-server-api.html
-   */
-
   /**
    * Registers your package when OS.js server starts.
    */