mezon-js 2.13.78 → 2.13.80

package/rollup.config.js

@@ -1,44 +1,78 @@
-/*
- * Copyright 2020 Heroic Labs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Rollup is the legacy build system for mezon-js and is only used for cocos2d-x-js support.
-
 import typescript from '@rollup/plugin-typescript';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 
 export default {
+    context: 'globalThis',
     input: './index.ts',
-    output:  {
-        format: 'umd',
-        name: 'mezonjs',
-        dir: "dist",
-        entryFileNames: "mezon-js.umd.js" // workaround for TS requirement that dir is specified in config
-    },
+    output: [
+        {
+            format: 'umd',
+            name: 'mezonjs',
+            dir: "dist",
+            entryFileNames: "mezon-js.umd.js",
+            sourcemap: true,
+        },
+        {
+            format: 'es',
+            name: 'mezonjs',
+            dir: "dist",
+            entryFileNames: "mezon-js.esm.mjs",
+            sourcemap: true,
+        },
+        {
+            format: 'cjs',
+            name: 'mezonjs',
+            dir: "dist",
+            entryFileNames: "mezon-js.cjs.js",
+            sourcemap: true,
+        }
+    ],
     plugins: [
+        // 1. nodeResolve MUST be first to find the files in node_modules and gen folder
+        nodeResolve({
+            browser: true,
+            extensions: ['.ts', '.js'] 
+        }),
+        
+        // 2. Only ONE typescript plugin. Use it to handle everything.
         typescript({
-            include: ["**/*.ts"],
-            target: "es5"
+            // Ensure this covers your source, generated files, and connectrpc
+            include: [
+                "**/*.ts",
+                "../webrpc/frontend/src/gen/**/*.ts", 
+                "src/gen/**/*.ts", 
+                "node_modules/@connectrpc/**/*.ts"
+            ],
+            target: "es5", 
+            module: "esnext",
+            tsconfig: "./tsconfig.json",
+            rootDir: "../", 
         }),
-        nodeResolve({
-            browser: true
+
+        // 3. CommonJS converts the output so UMD works correctly
+        commonjs({
+            extensions: ['.ts', '.js'],
+            // If connectrpc uses commonjs internally, include it here
+            include: [/node_modules/]
         }),
-        commonjs()
     ],
     moduleContext: {
         [require.resolve('whatwg-fetch')]: 'window'
+    },
+    onwarn(warning, warn) {
+        if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.ids[0].includes('node_modules')) {
+        return;
+        }
+
+        if (warning.code === 'EVAL' && warning.loc && warning.loc.file.includes('protobufjs')) {
+        return;
+        }
+        
+        if (warning.code === 'THIS_IS_UNDEFINED' && warning.loc && warning.loc.file.includes('@connectrpc')) {
+        return;
+        }
+
+        warn(warning);
     }
-};
+};

package/session.ts

@@ -25,17 +25,17 @@ export interface ISession {
   /** If the user account for this session was just created. */
   created: boolean
   /** The UNIX timestamp when this session was created. */
-  readonly created_at: number;
+  readonly createdAt: number;
   /** The UNIX timestamp when this session will expire. */
   expires_at?: number;
   /** The UNIX timestamp when the refresh token will expire. */
   refresh_expires_at?: number;
   /** Refresh token that can be used for session token renewal. */
-  refresh_token: string;
+  refreshToken: string;
   /** The username of the user who owns this session. */
   username?: string;
   /** The ID of the user who owns this session. */
-  user_id?: string;
+  userId?: string;
   /** Any custom properties associated with this session. */
   vars?: object;
 
@@ -49,29 +49,29 @@ export interface ISession {
 export class Session implements ISession {
 
   token : string;
-  readonly created_at: number;
+  readonly createdAt: number;
   expires_at?: number;
   refresh_expires_at?: number;
-  refresh_token: string;
+  refreshToken: string;
   username?: string;
-  user_id?: string;
+  userId?: string;
   vars?: object;
-  is_remember?: boolean;
+  isRemember?: boolean;
 
   constructor(
     token: string,
-    refresh_token: string,
+    refreshToken: string,
     readonly created: boolean,
-    readonly api_url: string,
-    readonly id_token: string,
-    is_remember: boolean) {
+    readonly apiUrl: string,
+    readonly idToken: string,
+    isRemember: boolean) {
     this.token = token;
-    this.refresh_token = refresh_token;
-    this.id_token = id_token;
-    this.api_url = api_url;
-    this.created_at = Math.floor(new Date().getTime() / 1000);
-    this.is_remember = is_remember;
-    this.update(token, refresh_token, is_remember);
+    this.refreshToken = refreshToken;
+    this.idToken = idToken;
+    this.apiUrl = apiUrl;
+    this.createdAt = Math.floor(new Date().getTime() / 1000);
+    this.isRemember = isRemember;
+    this.update(token, refreshToken, isRemember);
   }
 
   isexpired(currenttime: number): boolean {
@@ -105,18 +105,18 @@ export class Session implements ISession {
         const refreshTokenDecoded = JSON.parse(base64.atob(refreshTokenParts[1]))
         const refreshTokenExpiresAt = Math.floor(parseInt(refreshTokenDecoded['exp']));
         this.refresh_expires_at = refreshTokenExpiresAt;
-        this.refresh_token = refreshToken;
-        this.is_remember = isRemember;
+        this.refreshToken = refreshToken;
+        this.isRemember = isRemember;
     }
 
     this.token = token;
     this.expires_at = tokenExpiresAt;
     this.username = tokenDecoded['usn'];
-    this.user_id = tokenDecoded['uid'];
+    this.userId = tokenDecoded['uid'];
     this.vars = tokenDecoded['vrs'];
   }
 
-  static restore(token: string, refreshToken: string, api_url: string, isRemember: boolean): Session {
-    return new Session(token, refreshToken, false, api_url, "", isRemember);
+  static restore(token: string, refreshToken: string, apiUrl: string, isRemember: boolean): Session {
+    return new Session(token, refreshToken, false, apiUrl, "", isRemember);
   }
 }